From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 22 Mar 2010 10:47:09 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~91
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2b4185e457b35987b0b3ab59a58df7eb4aeb633d;p=emacs.git

Merge from mainline.
---

2b4185e457b35987b0b3ab59a58df7eb4aeb633d